From ec6baad4d82eaf2523db318a2ce728a5d75d8ec6 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Tue, 5 Jun 2001 21:53:56 +0000 Subject: [PATCH] rename from gtk_text_iter_reorder 2001-06-05 Havoc Pennington * gtk/gtktextiter.c (gtk_text_iter_order): rename from gtk_text_iter_reorder --- docs/reference/gtk/tmpl/gtk-unused.sgml | 8 ++++++++ docs/reference/gtk/tmpl/gtkrange.sgml | 3 ++- docs/reference/gtk/tmpl/gtkscale.sgml | 4 +++- docs/reference/gtk/tmpl/gtktextiter.sgml | 9 --------- gtk/gtktextbtree.c | 8 ++++---- gtk/gtktextbuffer.c | 12 ++++++------ gtk/gtktextiter.c | 6 +++--- gtk/gtktextiter.h | 2 +- 8 files changed, 27 insertions(+), 25 deletions(-) diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml index 5b1b92715b..6eb4e0cae8 100644 --- a/docs/reference/gtk/tmpl/gtk-unused.sgml +++ b/docs/reference/gtk/tmpl/gtk-unused.sgml @@ -1528,6 +1528,14 @@ Creates a border around the arrows of a #GtkSpinButton. The type of border is de @Returns: + + + + + +@first: +@second: + Private: print debugging information while doing a gtk_object_ref() or diff --git a/docs/reference/gtk/tmpl/gtkrange.sgml b/docs/reference/gtk/tmpl/gtkrange.sgml index dc47896ff2..8275518b0b 100644 --- a/docs/reference/gtk/tmpl/gtkrange.sgml +++ b/docs/reference/gtk/tmpl/gtkrange.sgml @@ -71,8 +71,9 @@ Virtual function that moves the slider. Used for keybindings. @range: the #GtkRange -@step: how to move the slider +@arg1: +@step: how to move the slider @arg2: diff --git a/docs/reference/gtk/tmpl/gtkscale.sgml b/docs/reference/gtk/tmpl/gtkscale.sgml index 2a3383272b..ebcbb12a14 100644 --- a/docs/reference/gtk/tmpl/gtkscale.sgml +++ b/docs/reference/gtk/tmpl/gtkscale.sgml @@ -100,8 +100,10 @@ format_value_callback (GtkScale *scale, @scale: the object which received the signal. -@value: value to format +@arg1: @Returns: allocated string representing @value + +@value: value to format diff --git a/docs/reference/gtk/tmpl/gtktextiter.sgml b/docs/reference/gtk/tmpl/gtktextiter.sgml index 33f05398fc..6e19122100 100644 --- a/docs/reference/gtk/tmpl/gtktextiter.sgml +++ b/docs/reference/gtk/tmpl/gtktextiter.sgml @@ -781,15 +781,6 @@ types related to the text widget and how they work together. @Returns: - - - - - -@first: -@second: - - diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c index 58e0d0c79e..df58227fca 100644 --- a/gtk/gtktextbtree.c +++ b/gtk/gtktextbtree.c @@ -569,7 +569,7 @@ _gtk_text_btree_delete (GtkTextIter *start, g_return_if_fail (_gtk_text_iter_get_btree (start) == _gtk_text_iter_get_btree (end)); - gtk_text_iter_reorder (start, end); + gtk_text_iter_order (start, end); tree = _gtk_text_iter_get_btree (start); @@ -1592,7 +1592,7 @@ _gtk_text_btree_tag (const GtkTextIter *start_orig, start = *start_orig; end = *end_orig; - gtk_text_iter_reorder (&start, &end); + gtk_text_iter_order (&start, &end); tree = _gtk_text_iter_get_btree (&start); @@ -2182,7 +2182,7 @@ _gtk_text_btree_get_text (const GtkTextIter *start_orig, start = *start_orig; end = *end_orig; - gtk_text_iter_reorder (&start, &end); + gtk_text_iter_order (&start, &end); retval = g_string_new (""); @@ -2610,7 +2610,7 @@ _gtk_text_btree_get_selection_bounds (GtkTextBTree *tree, } else { - gtk_text_iter_reorder (&tmp_start, &tmp_end); + gtk_text_iter_order (&tmp_start, &tmp_end); if (start) *start = tmp_start; diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c index 2e30d026ac..c014ba4b25 100644 --- a/gtk/gtktextbuffer.c +++ b/gtk/gtktextbuffer.c @@ -847,7 +847,7 @@ gtk_text_buffer_real_insert_range (GtkTextBuffer *buffer, src_buffer = gtk_text_iter_get_buffer (orig_start); - gtk_text_iter_reorder (&start, &end); + gtk_text_iter_order (&start, &end); range_start = start; range_end = start; @@ -1130,7 +1130,7 @@ gtk_text_buffer_emit_delete (GtkTextBuffer *buffer, if (gtk_text_iter_equal (start, end)) return; - gtk_text_iter_reorder (start, end); + gtk_text_iter_order (start, end); /* Somewhat annoyingly, if you try to delete the final newline * the BTree will put it back; which means you can't deduce the @@ -1213,7 +1213,7 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer, gtk_text_buffer_begin_user_action (buffer); - gtk_text_iter_reorder (start_iter, end_iter); + gtk_text_iter_order (start_iter, end_iter); start_mark = gtk_text_buffer_create_mark (buffer, NULL, start_iter, TRUE); @@ -1966,7 +1966,7 @@ gtk_text_buffer_emit_tag (GtkTextBuffer *buffer, g_return_if_fail (tag != NULL); - gtk_text_iter_reorder (&start_tmp, &end_tmp); + gtk_text_iter_order (&start_tmp, &end_tmp); if (apply) g_signal_emit (G_OBJECT (buffer), signals[APPLY_TAG], @@ -2148,7 +2148,7 @@ gtk_text_buffer_remove_all_tags (GtkTextBuffer *buffer, first = *start; second = *end; - gtk_text_iter_reorder (&first, &second); + gtk_text_iter_order (&first, &second); /* Get all tags turned on at the start */ tags = gtk_text_iter_get_tags (&first); @@ -3021,7 +3021,7 @@ cut_or_copy (GtkTextBuffer *buffer, else { gtk_text_buffer_get_iter_at_mark (buffer, &end, anchor); - gtk_text_iter_reorder (&start, &end); + gtk_text_iter_order (&start, &end); } } diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c index 253e104ac5..9702a0b570 100644 --- a/gtk/gtktextiter.c +++ b/gtk/gtktextiter.c @@ -4682,7 +4682,7 @@ gtk_text_iter_in_range (const GtkTextIter *iter, } /** - * gtk_text_iter_reorder: + * gtk_text_iter_order: * @first: a #GtkTextIter * @second: another #GtkTextIter * @@ -4695,8 +4695,8 @@ gtk_text_iter_in_range (const GtkTextIter *iter, * **/ void -gtk_text_iter_reorder (GtkTextIter *first, - GtkTextIter *second) +gtk_text_iter_order (GtkTextIter *first, + GtkTextIter *second) { g_return_if_fail (first != NULL); g_return_if_fail (second != NULL); diff --git a/gtk/gtktextiter.h b/gtk/gtktextiter.h index 8a883f9b23..174be5d99a 100644 --- a/gtk/gtktextiter.h +++ b/gtk/gtktextiter.h @@ -256,7 +256,7 @@ gboolean gtk_text_iter_in_range (const GtkTextIter *iter, const GtkTextIter *end); /* Put these two in ascending order */ -void gtk_text_iter_reorder (GtkTextIter *first, +void gtk_text_iter_order (GtkTextIter *first, GtkTextIter *second); /* Debug */ -- 2.30.2